Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Dec 2011 17:06:42 +0000 (09:06 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Dec 2011 17:06:42 +0000 (09:06 -0800)

Trivial merge